Avoid making backup files in ediff when `make-backup-files' is nil

* lisp/vc/ediff-util.el (ediff-arrange-autosave-in-merge-jobs):
Don't make backup files when `make-backup-files' is nil (bug#21599).

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index b2b92b17e28fe6b4f35d9fa2b9cd035a04f01c97..0cbea2c28d7b9f631e331fa7f4f84f5bfc20a100 100644 (file)
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -563,8 +563,9 @@ to invocation.")
            (set-visited-file-name merge-buffer-file))))
     (ediff-with-current-buffer ediff-buffer-C
       (setq buffer-offer-save t) ; ask before killing buffer
-      ;; make sure the contents is auto-saved
-      (auto-save-mode 1))
+      (when make-backup-files
+        ;; make sure the contents is auto-saved
+        (auto-save-mode 1)))
     ))
 
 \f